fixed remaining issues and added ding