added a bunch of unworking stuff