add more enable/disable defines
switch to network
upgrade contiki