Kali: Misc ordering, improved comments, minor tool fixes