bugfixes and name hanging