Design updates, fixes