namespace corrections
added comments