many changes
more iterative changes...