Some fixes, some minor tweaks

Bit of a jumble this one ... fixed a query, minor theme updates, errror typo, etc