Adding mortality tables, fixing a bug