moving chef core attributes around, minor corrections and additions