fixup! Fix unused parameter warnings
Improve typedefs
Fix function declarations