Updated docs and housekeeping