bugfixes and improvements