fix biblio for tuna, fix some code layout issues