better empty delimiter handling, more comments