Several new changes to BS project