Minor improvements of math classes
Minor improvement of window classes