minor fixes, packet templates