Fixed #1, NIC changes, other changes