Further updates mainly to MaidManager.