Tool improvements & more

All changes divided by commits and each commit has explanation to why it's should be added/changed.