A little more design, minor improvements