Updates

Added spec and cleaned up exceptions in calc.cpp