Fixed some issues with type management; made type management optional.

Signed-off-by: Atheriel <atheriel@gmail.com>
Merge pull request #1 from JPokemon/type-changes

Fixed some issues with type management; made type management optional.