makefile and lock & related changes