Minor changes and other tweaks, keep for safe-keeping