Tidy
Fixed attendance bugs
Comments
Fixed bug resulting from merging