Kinda fixed stuff...