loading fixes...