modified to set up only local development machine + fixed some bugs