fixed some pull requests issues