fixes+top-level makefile by V.Botbol
better archive script
merge with master