improve design, fixes