Fix variable assignments and add new templates