Improvements fixes and lives