a couple more bugs