Fixed some stuff.. broke some stuff..