Fixed some simple null pointer errors
A few more tests passing. 20.txt passing
60.28% submission