Yea! Fixed stupid broken stuff by actually thinking things out!