Added a description field, various bug fixes