minor fixs ff