More tweaks for control locks and to handle jump ship stuff
Version 3.0.0.3-beta Ready