Fixed easy issues & sorted through what does and does not work finally
still testing focused
testing focused