PIN Locking + Bug Fixes