fixed errors, 100% covered