bugfixes, updated for Settings