styles
small fixes
small fixes 2
remove required