Make local settings change proper
Add more commands