Fix scaling bugs & rename canvas member vars.