More paging improvements, moved spy settings to general