made move routines more defensive, corrected scale on hall graph
merge branches