Updates

Per Kevin's requests on 9/16/14