fixed minor bgs