polishing out final bugs...