OMG

fixed some little bugs~