few tweaks, playing in progress