minor corrections, updated to sync with newer features