fix status bugs