SUPER BUGFIX No 1

Makefile improved, bugs fixed . . .