Switch to mangle, Fix stray NS

# 5.2.3 03/18/2013 Use Mangle to generate combo points except for high energy situations. (Hopefully) fix issue with misplaced NSs.