deleted unneccesary functions, moved a couple to numerical.cpp