fixed lab 11, 12
minor changes in calculator