Fixed the remaining problems\! All the tests pass now.