Some cosmetic corrections and some minor work on the nick model. Hopefully I