Stylus improvements

Improvements to Stylus support