Some fixes.
Remove redundant line of code.
Make rps movements retry over 1 minute before giving up.