Yeah you are both correct, had completely forgotten those aspects of them.

Have clarified what I meant and removed those two.