minor bgs fixed