Fix some copy/paste mistakes

And the initial moveComponent code.