Bugfixing MedCalc

#40, #34, #24