fixed a lot of bugs in the dolly implementation