added layouts / improved use of defaults / version bump