more bugs removed