almost finished oauth
fix env