fixed source bundle generation
improved dependency management and fixed related issues.