major merge, build/check/install ok
minimum documentation
fix man