now stylus based
small bug fixes