Many small fixes, published version 47