Run: Tons of fixes and optimizations