Some basic updates and clean up to get back into working on this project