Alex's changes

Stuff from yesterday that never got comitted