safe keeping upload for dev v2.0

Lots of bug fixes.