better make, coverage and tests; bug fixes