Fixed comments an assert