Readability and Dock handling changes.