minor fixes - getting there