Add experimental manual toolchange option, go back to joushou/pb during PR, various changes