added calculator.js, played around with canvas more