Subvolumes...

Some fixes for commands