Merged some changes from DF's branch.

Started implementing an on-screen numpad for touch-screen compatibility.