doc and tests ++. minor clean