Some comments and config changes