tweeks and fixes, push to v2.0.1