added a munch of stuff