Sweep and apply silly bugs fixed