Fixed Some Problems