Features made for Bartercas3

See commit descriptions.