minor changes -- still wip