Review

A bunch of code fixes
I'm afraid -1 is not a variable type :stuck_out_tongue_winking_eye: