development & fixes