bugfixes and styles added