some fixes, plus bin support