loading tweaks (also fixes #1)