Closes #10; Fixes a control locking absence; Fixes #11