added lots more types and file numeration/output