completed subset 4 tests, added lots of little things