Tool changles & other fixes

The last one without faceposer changes. I will do smaller pull requests in the future.