Tweaks 11/1/2013
Cleanup
Add nhlrip