bugs solved, tombstoning implemented