increase coverage, minor fixes