first commit
small fixes