bool and makefile changes