Changed some lock things
More changes