Making some improvements

Will be live in 10 hours