Fixed and improved commands