Various updates and fixes. :o