Fixed a few little things. I'll probably have more changes to make later, once I understand everything better. Also added a missing syntax line. Closes #5806