a few more bugs