fixed selection issues, cleaned up drag&drop