Improved handling of multiple displays and some other minor chagnes