minor changes to calculator abstract