DocBlock improvements and general refactoring. Version bump to 1.0.2.