added dampening, fixed a few bugs