separating commands in makefile and other minor fixes