Some changes, needed to push up because I'm about to blow away my computer.