minor bugfixes and visual improvements