6/13/14 - fixed bugs