various changes on style and construction