typos and stuff
merge