Debug + design improvements