Bugfixes, imports and formatting