Fix command line issue + move to true BCPS

See title.