fix many issues...