Fixed More bugs