Fix JavaDoc comments
Add window
Improve window