Added sounds + some changes