Two types of locks, cleaned up/created one more level
Minor changes