lock and other changes

ability to lock