window bounds half working
Merge branch 'P'