changes done by marvin mostly spacing differences

changes done by marvin mostly spacing differences
small fixes

small fixes