TF dos added, bug fixes