fixing tabs
comments
escaping templates used by travis