Makefile and form updates