some minor changes after testing rpg_commander