cleanup & fixes