title tweaks, more bugs, etc