Added locks to critical points

This has however, caused tons of gridlock issues...