Added haptimap toolkit, and some more..