more fixes and citation