fix: check/fix return types and tighten argument types

fix: check/fix return types and tighten argument types #70