fixes - review suggestions