Lots of changes

All of Kristina's work tonight.