fix Jimmic part & finish all