A few more tweaks. It's now stable. Woohoo!