major changes toward dynamic managements
fixed visible bugs after merge