Fixes last Darick's notes on design