Finished off most doc features