User settings

This is a pull request for issues #455 and #456.

Ah, actually not, they are not used at all anymore.