bug fixes and styling quirk fixes