bug fixed, still more