Various design items and bug fixes.