fixed minor stuffs, no functionality added or changed