Fixed up some variable name issues and locked status