Made small changes to try to get shortcodes to work.