adds more options and updates templates to match