* fix many issues