clean up & fixes