found some more bugs