minor tweaks: completion, loading functions