added some more stuff, and a little more functionality