few template tweaks and subpackages