spring clean changes, including schema tweaks
tweaking