improve loading, fixed adding missing assignments