Fixed stuff \o/ Yeah!

Yeeeeah!