cleanup and organization, remobed BC20.txt.org (an old artifact of me scared of doing merges and screwing them up)