some design fixxes