Fixed Some things... quite a few