fixes, area dist, merge