Syncing up changes from the weekend. Not a lot of action, just a few heap corruption issues that were introduced between commits are now fixed.