A lot more bug fixes.
More tweaks.