various clean up+real logging...