Adjusted some settings, removed static handling