initial commit
fixes
a merge