Improving error reporting
Checking env variable for auth token - required for development
Fixing template