Bugfixes and rebarified