Jarv/fix shell commands