some bugfixes and improvements after huge qa