reorganized bucket, added assert on bucket, and fixed a bug found with assert
asert added to some functions & commented code removed
Merge branch 'vdev' into develop