Styling, minor bugfixes