fixed bigger issues with pull request