Integrate work from Saturday & basic code cleanup.