Some control updates
gf upgrade and bug fix