some fixes, more inbound...