While we're at it, also do some light refactorings - multiple outputs - use sourceforge mirror - meta cleanup