refactor, fixed contacts, added some sounds