gvine hotfixes and cosmetic changes.

Changes pre-david/elliot meeting