fixed some things 7/5/14