Small changes before perhaps switching to PhysiJS.