added TODO; clean up modifiers print