I 94 extension

Hi,

I have two questions -
a) I have got valid H1B visa stamped with date from October 2013 to August 2016. However I came to USA only on July 2014 (after 9 months of Valid H1B start). But, the online I 94 still shows till August 2016. What is the way to extend it to end by the 9 months ( to May 2017), considering that H1B is valid for 3 years before extending for another 3 years.

b) My Indian passport is expiring by October 2015. What needs to be done to renew the passport? Do you I need to go to India to get the Visa stamped again after new passport is received?

Your inputs will be very helpful.