tweaks for loading, not ready for 0.9