add manage_package param, restore nx_tcp_nopush
minor template tweaks