added damping, fixing some accessors; testing