Multiple file selection for 3.0+

Other bug fixes.