Various fixes

Fix moves
Correct spelling
Remove duplicate array set