Whoops, forgot to delete this variable, and fix a couple small bugs.