fixes from eastwood run