Added TextStyles. Other minor improvements