Renaming things & more inline docs.