slight design fixes