First Commit
small fixes