general: Makefile fixes and typos