cleaned up calc, made more buttons work