large refactoring, mouse race condition fixes, Delcol functionality