Bug fixes and partial implementation of UpdateNicCmd