fixed many load order issues