lots of updates after a long hiatus; ORPHAN: nightingale (too much work)