Add author info and fix parsing issues