more progress on !X; minor unrelated stuff