problem24 wip + problem25 solved

still got issues with pb24.