Final edits and changes based on training class held y'day