Bugs from last commit fixed

Pls don’t be checking these commits walker.
sort of fixed immediate errors, but code is buggy.