Initial commit
fixing bugs