jiq enabled and fixed in Makefile, some comments added