Fixed configurations in gen_conf.py and minor changes to Makefile