Add moar sounds

- Also start to cleanup code a bit