touch screen optimising and minor fixing