some fixes for F
some minor parameter changes