fixed lock settings + added comments