added location, getting ready for remote trial; small bug fixes