Some comments added to config and helpers