cleaning up & fixes