Lots of modifications to allow for addition simplification of compile time functors.  Fixed various other things as well.