Add window titles
Remove TODO already done
Fix a bit
[sync] 0.5.0.2