Fix null !== undefined mistake in #220 and improve rendering slightly

Fix null !== undefined mistake in #220 and improve rendering slightly #86