restore project file
more cleaning up
update bib and packages
small clean ups (merge maintenance)