made tweaks to rake, and fixed a few tests. All tests passing.