Tested working commit, fixed some typos