Avoid performance penalty
Remove old inaccurate comments
Add status window