chore(*): design and fixes