first commit
small fixes
only left to align