* some name changes in the conf keys, and updates to