finished gustafsson05
merged changes and fixed an error in paper life cycle