small fixes and styling