Some basic improvements to the refactor branch #353

Closed thedjpetersen closed 10 years ago