BAO fix bases (+neutral interaction) + lot of cleanup