Massive improvements & bugfixes.
Many more bug improvements; still a little to work through.