impro & fixes