various fixes
add sci-puppet integration
fix cbs-setup