Mostly documentation and updating from comet