More docs and comments