bugfixes and lives added