fixity
some a.p != nil assumptions
remove some hacks that were now causing problems now that better hacks are in place.