more work
unbind from TFS
several fixes