fix: correct return types and callable shapes for type safety

fix: correct return types and callable shapes for type safety #11