Add additional types.
Many dialyzer and formatting fixes.