Misc improvements and changes.