more fixes to fn