made simple changes, using env vars now
new bootstrap