New output, fixed stuff, added 2000 test case.