Update with more comments and sensible configuration