Cleanup, tweaks, etc.