made more re-entrant
fixed normalization and underspecify missing entry