fix a type (add instead of Add); untabify on save when tabs are disabled; some indentations I'm not sure about;