fix somebugs