Fixes and more commands