Fix type annotations (closes #27)

Still have to go through the docblocks and fix them for the automatic
documentation generation.