Almost finished updating to latest version of cwrc. Remaining is mostly CSS/Style related stuff.