Resolved merge conflicts
Fixed some jgmake bugs