fixed 3 issues. Running on fuerte