Mostly design updates and fixes