cleanup and added radio buttons for repeat options