Draft pages removed, misc changes