B/cleanup

Looots of additional comments
removed a few minor functions that are no longer called anywhere
doing a brain-dump while things are fresh