Working on sound and fixed some bugs