minor updates (a lot)
refactor
refactor