Major bugfixes. So many to count.