TODO updated
Fixed idiotic little bugs that shouldn't have been there if I had closed everything off properly last time I worked