added logging, moved to latest version of CDI spec, etc