fixed tabs
added type checks for sorting
check for breakpoint in redraw
Merge remote-tracking branch 'upstream/V2' into V2