Language and ACP template improvements/cleanups