solving more bugs