configuration update

General configuration commit. Hope, didn't forget anything.