init covered, minor changes