cleaned up notebooks and did some bugfixing on rake calculations