first commit
more fixes