Roger: fixed dependency list in makefile plus other indentation/const-correctness things