Fixed Some Shtuff