first commit
fixing errors