BUG: goes back to localhost, resolved
added few comments