further bugs...