Extensive update including decent docs (continued)