bug fixes, styling