last round of updates for style and function