changes from Matt Funk (about SE) and one fixthis hopefully resolved