Kali: Major overhaul of internal workings.

...Couple of bug fixes & few new tools