[Makefile] more fixes and different style