drafted some fixes for gather/take bitrot.