f3 update and bug fixes