Fixed More Problems