first commit
fixes