Some more design fixes, as well as functionality improvements.e