Fixed 7/30 issues and major 3.b