minor fixes
extracted some commands and interceptors as plugins