Sweep control added, more GUI responsive hacks added