a few more changes ; wip still