Fixed stuff, now 95% more working