Cleaned up category.
Cleaned up classes.
Added update parser.