Some more changes ^_^

It's still F.*.C.K.E.D, but well...