little fixes and 80% cov