Add "getter" commands
Small tweaks