More implicits and comments