Some docs and comments