Fix typesetting & add Makefile