Fixed everything but empty return tags.