* cleanup & fixes