Squeezebox bugs corrections (#1077 + #1082) + some cleaning