ghost busting deltas + some bugfixes