Finally got around to making changes after 3rd Thurs critique...