added a bunch of various things