partial update to sync with corestar; still doesn't compile!