YYProjection2 added.
Lots of cleanup.