added more scolling and text checks