Fast changes

per Chris, these will be merged