More items

Added a bunch of items, and fixed a couple of missing code errors from
the last commit (forgot to commit those files). Still no progress on
tree generation, will re-write that system.