split up decorator header into category-based headers
simplify code for declaring decorators
add decorators for torque and force