Minor fixes and some refactoring
Merge branch 'master' of https://github.com/The-Master777/boxtool