Almost all fixed

Yep... Definitely seemed like I inverted width and height.