first commit
some more changes
some problems