Feature/cfy 449 bash improvements