fixed user-select, minor updates