Added some more stuff that's sort of useful and/or required right now.