Tracking of lives and bugfixes. Beginning of final integration