ang -> angl, some hiding of temp stuff