More tweaks, etc.
Fix more stuff