Several command bugs squished