Little 'const' and upgrade Makefile