3rd kolo + fixes