fix status stuff