added more missing templates + fixes