Stylus improvements

Work in progress