more fixes and styling changes