initial commit
small fixes