don't show assert at the end
minor fixes