fixed paths, broken stepping and  some invalid returns