F2 range bugfix and misc improvements