Design improvements, fixes and cleanups