More tweaks; still a way to go before it does something useful.