Clean up a bit
Make it work
Fix up repo mirror handling