Merge in a bunch of updates from fly-man

merge in a bunch of updates from fly-man