Added access_taxi and a few comments