Singing and bug fixes