Some bugs fixed, 176 test passing, 4 failing.