Better error reporting, deep_merge, click_once with change_pages