switched to new models
whitespace
fixed typos
added notes
added stuff