Bugfixing, some types