Fixed 10/12/14 bugs