Bugfixes bug and improvements