Better mouse detection + breaking out data transforms