Some makefile tweaks + better hdd.img generator