Stage 4 works again + small bugfixes