2.05.4:Miaow:14 more #142 stuff and minor fixes