Alv2 Headers + OODT Engine changes
+ A few cosmetic fixes