Added author, more CFG