bugfixes; visual improvements