bug fixes, styling additions