pushed merges & fixes (lot of cruft included)