Fixed most of what was wrong
Hmmm