Minor comment updates + changed api version to 2.