bug fixed. still more