more clean up & small fixes