More fixes and updated instructions for our new setup