changed cap repo back to bitbucket
final fixes and updates for v2