-coverage added
Many fixes, especially with -r