Door rework, level tweaks