reorder library loads to fix rump issues
cleanup