just a few more bugs