bug fixes

fixes more/less logic; adds to return the original element in the callbacks.