(Properly) added move to a free location when idle and fixed display to display more sensiblly.
Fixed bugs in display code and finally corrected movement logic
fix conflicts resulting from branch merge