fixed minor stuffs