Both in good order

tested and running

One spoiler missing

Unboxed