fixed 3 issues