Fast changes

per Chris, these will be merged. Not yet tested.