minor changes while I ponder the upcoming problem