Develop

just fixing up some extensive DocBlocks for docs generation in the future