Testing and bug fixes as of 9/9/2013