Loads of stuff, including command improvements/fixes