StarNub - Minor Misc changes