first task & fixes