some bugfixes and ui