Initial commit
small fixes
Ceanups