more bug fixes and slight styling changes