Added {#FORT_TIME} and {#ADV_TIME} base templates
Small bugfixes