Added HTML building and improved Makefile