added comments to category
Lots of updates and refactorings