Testing and bug fixs as of 9/6/2013