Dev/ki

Let's open a pull request and use it for comments.

Good stuff. Some comments on code lines. 
Also, kill the commented out lines which you no longer need (like tooltip).