update missing entries + more fixes