Mostly sound fixes with heart beats

and stuff