fixed stuffs
small stuff