F#

Addittions and improvements