fixed things that were lost during pull request