More stuffs and ya. Bug fixes too I think.