All the rest fixed and some commands changed