design, fixes