added a lot of stuff... most of it is somewhat nonsensical at the moment