clean up & small fixes