o improved responsiveness to dock requests
o some style fixes