fix doc block and some formatting