Bugfixes
Fix formatting