Split settings, bug fixes, etc