Some progress on #86, plus fixing a bug on loaded messages.