changed config
merging bunch of bucket and view changes
removed helper functions