Moved draw check function to be called after rows, and fixed boolean returns.