Added spellchecking to tex files
updated stuff
fixed merge errors