Fixed some stuff that was messed-up in the merge, added some sounds