add proper public source box, small fixes