Finish doc and add last missing pieces