ActiveModel Serialization; plus minor fixes.