Comments + better templates directory handling