Fixed Some Of The Broken Code