push out const correctness and fix makefile