Code cleanup and bug fixes. Chapter is now a required field for Event due to bug with entity-association and nodeaccess module causing events without chapters to not display