* fixes before pull request