Moving to environment variables for config and defaults
adding changes few a few fixes