Comments added, additional config changes, TODO added