wip
minor changes