fix many issues