first commit
minor fixes