- improve cpan support (now with tests)