initial commit
minor fixes