Fix makefile, update bundle