a few more bugs...