fixes and adds. email Nick 29072013 2:40PM