!modonly and !subonly

Closes #31