Added more comments
Added some more functions and comments
Merge branch 'master' into client