Split some updates off of the mass commit
Split up all the command fixes