Remade Makefile; Added character locking