Added stufffs
fixed thing
Fixed bugs