minor fixes
Merge remote-tracking branch 'origin'
improve resize window