Initial commit
small fixes