removed testing
Various fixes
Stopped making bad choices with my life