fix .current relative to all elements and a few other subtle bugs