added calculator module
more sanity checks