commit
fixing bugs