bugfixes and styling