Further into the dream mode. Some changes made elsewhere as well.