Reformat, bug fix, add sound effect