typos and stuff
merge fixed