cosmetic changes
enums to clean up cross_*.cpp code a bit