more progress, files split, better templates