Fine tune.
Add vinyl support, enhance test cases.