fixes+top-level makefile by V.Botbol