added command context, minor corrections, added mavahlid braeter