Removing old reg hack functions
Tweaks to base commandline usage