Making progress

Fixed some bugs, cleaned up code, pruned away more useless parts of the
tree earlier in the process.