Many fixes; 2to3 string issues; duplicate terminal window controls etc.