Tweak unite
Remove outline
Revamp locking script