fixed issues I was having