improvements
wip
to bin