Bugs fixed!

Took me bloody long enough, but I nailed em. Now I get to play with enhancing graphics. Yay!