Additional comments, move some code

Should improve documentation of new and old click code