Started writing missing comments.
Merged from master
Added moar comments