move
many tweaks and fixes