Updated templater and clean stuff up. Need to comment still.