few design improvements