bugfixes and temporarily moving a single element