fix layer numbering, add switch for detailed time calculation