Better delimiter handling, feedback