Header file cleanup
Removed testing ray
Minor refactoring
Combo tweaks
C++11 friend