Fix someone's debug and work on control and makefile