some updates of my own + iran's changes

 - tools have separate makefile
 - Iran's changes spliced onto your git history and included
 - I fixed some nasm warnings with his stuff