f# fixes and improvements