finishing touches on v 2.0