Added 'project' and 'blocks' to Issues. Fixed inconsistencies in Comments.