Categories for Commitments

New and existing commitments now support categories, and also some bug fixes related to commitments.