added canvas-border
removed old collision checks, added math vars to shapes, started animation