Fix and improve more