cleanup
and fixes