Made more changes to reference the core specification. Note. -reference classes were deleted and need to find out why.