progress

bugfixes and styling