Types fixes

Almost working correctly..... damnit.
Merge branch 'master' of https://github.com/lukecaraccioli/Cath_Lab