Bug Fix: Canvas Clearing

Also fixed some missing variable bugs for calculations that were no
longer relevant.