merge changes to fcgi

simplify fcgi support/usage in progress, merging changes is all here...