some design fixes - nothing important