Fixed both of those.

Thank you so much for the suggestions, peacenlove.

-X