style and functionality improvements