This is an update to Maktaka's Bugfix mod in which I've added some fixes that he never had time to include, with his permission.