General updates. Adds some fields to models/forms, fixes some typos, adds some relationships