updated F3 and minor polish