Included some doc and minor adjustments