some fixes and styling improvements