small fixes, hide typedefs into .hpp