More stuff fixed
Everything is better!