fix some issues but there are still some
60
80