several improvements in styles