Minor update and door demo simplification