more assert removal and added logging