Errors cleared on input - FTs written and some refactor