changes from devbox over time
merge fixes