style changes, and improved functionality