FORCE_NIC added, bugfixes, code cleanup