added a bunch of stuff
added more stuff