Added document references
Added Comments. Fixed some namespace cross-over.