tracking player trigger and new icons
refactor 2
Merge pull request #48 from ynotLeft/refactoring

Refactoring