cleaned up a few things, added humans and robots