beta preparations

Fixes to the Lock System