Updated Makefile, bootstrap and pluginhook