Updated several subassemblies and commands