Updated to latest CWRC-Writer, and preformed some basic refactoring.