cosmit and fixes